Refactor OkHttp to use applyJavaModules() - #9633
Open
LouisLou2 wants to merge 1 commit into
Open
Conversation
swankjesse
approved these changes
Aug 6, 2026
swankjesse
left a comment
swankjesse
left a comment
Collaborator
There was a problem hiding this comment.
I’d prefer to hardcode all of these values to 9, cause that way searching for java9 turns up results. (We’re unlikely to have separate directories for other Java versions here)
| } | ||
|
|
||
| from(compileJavaModuleInfo.map { it.destinationDirectory }) { | ||
| into("META-INF/versions/$javaModuleVersion/") |
Collaborator
There was a problem hiding this comment.
Suggested change
| into("META-INF/versions/$javaModuleVersion/") | |
| into("META-INF/versions/9/") |
| tasks.register<JavaCompile>("compileJavaModuleInfo") { | ||
| val compileKotlinTask = tasks.getByName("compileKotlinJvm") as KotlinJvmCompile | ||
| val targetDir = compileKotlinTask.destinationDirectory.dir("../java$javaModuleVersion") | ||
| val sourceDir = file("src/jvmMain/java$javaModuleVersion") |
Collaborator
There was a problem hiding this comment.
Suggested change
| val sourceDir = file("src/jvmMain/java$javaModuleVersion") | |
| val sourceDir = file("src/jvmMain/java9") |
| val compileJavaModuleInfo = | ||
| tasks.register<JavaCompile>("compileJavaModuleInfo") { | ||
| val compileKotlinTask = tasks.getByName("compileKotlinJvm") as KotlinJvmCompile | ||
| val targetDir = compileKotlinTask.destinationDirectory.dir("../java$javaModuleVersion") |
Collaborator
There was a problem hiding this comment.
Suggested change
| val targetDir = compileKotlinTask.destinationDirectory.dir("../java$javaModuleVersion") | |
| val targetDir = compileKotlinTask.destinationDirectory.dir("../java9") |
LouisLou2
force-pushed
the
issue-9103-kmp-java-modules
branch
from
August 6, 2026 13:48
461abe6 to
e3aabfd
Compare
Author
@swankjesse Agreed. I've applied all three suggestions. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This extends applyJavaModules() to support KMP, preserving the existing multi-release JAR setup.
Closes #9103
Testing
Ran: